Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support vsock on Android as well as Linux. #1301

Merged
merged 1 commit into from
Oct 6, 2020
Merged

Support vsock on Android as well as Linux. #1301

merged 1 commit into from
Oct 6, 2020

Conversation

qwandor-google
Copy link
Contributor

This change depends on rust-lang/libc#1905 so can't be merged until that is merged and released.

@qwandor-google qwandor-google marked this pull request as ready for review October 1, 2020 08:58
@qwandor-google
Copy link
Contributor Author

The libc change has now been merged and released, please review.

@qwandor-google
Copy link
Contributor Author

The CI failure looks unrelated to my change as far as I can tell, is there some way to rerun it?

@asomers
Copy link
Member

asomers commented Oct 2, 2020

I think that failure is due to a bug in glibc. I restarted it. But note this warning, that is probably related to your PR:

use of deprecated item 'nix::libc::VMADDR_CID_RESERVED': VMADDR_CID_RESERVED is removed since Linux v5.6 and replaced with VMADDR_CID_LOCAL

@qwandor-google
Copy link
Contributor Author

Ah, that might be because of the libc version upgrade. Fixed now.

@asomers
Copy link
Member

asomers commented Oct 3, 2020

Looks good. Now please squash your commits.

@asomers
Copy link
Member

asomers commented Oct 3, 2020

Also, looks like you'll need to rebase.

Fix deprecation warning from libc update.
@qwandor-google
Copy link
Contributor Author

Thanks, rebased and squashed.

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 6, 2020

Build succeeded:

@bors bors bot merged commit 59e33bc into nix-rust:master Oct 6, 2020
@qwandor-google qwandor-google mentioned this pull request Oct 6, 2020
@qwandor-google qwandor-google deleted the vsock branch October 6, 2020 09:26
bors bot added a commit that referenced this pull request Oct 12, 2020
1307: Release v0.19.0. r=kamalmarhubi a=qwandor-google

I'd like to get a new version of the crate released including #1301 so that I can get the vsock crate building on Android, and get both imported into the Android tree.

Co-authored-by: Andrew Walbran <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants